Yesterday
merge from fix_crocs_dying_at_jungle_pond