Today
Merge from cinematic_speed_fix