Today
Merge from jungle_update (fix croc being kite-able around twig foundations)