Yesterday
Merge from wr_parachute_fix