Merge branch 'merge_root_into_live'