Merging master in delete-legacy-promotion

WOOT