Merge branch '2037_source_tree_changes'