Merging into changes from dev into master to reflect the state of the deployed scenario editor.