Today
Merge from jungle_update (fix tiger being stuck when spawning in river)