merge from jungleupdate