Yesterday
merge from scrap_heli_gibs_fix_2