merge from mission_improvements_may_24 (bandit_town.prefab kept source changes, will need another S2P)