Yesterday
merge from projectiled_batched_demo_fix