Today
Merge from scientist_spawners_enabled_fix