merge from jungle_update