Yesterday
merge from scene_warmup_fixes