Today
merge from static_entities_hostile_fix