Merge branch '2862_tree_refresh_fix' into 4.8.1-stable