Yesterday
merge from patrolheli_watercrash_fix