Merging master into delete-legacy-promotion