merging master in to delete-legacy-promotion

There were a hand full of merge conflicts to be resolved. Tested them out manually and with the auto-tests.