Merge branch '2862_tree_refresh_fix'