Merge branch 'tree-bg-fix'