Yesterday
Merge from demo_shot_improvements