Yesterday
merge from jungle_tree_fixes