Consolidate source 2 style modals to make room for a new style creation modal.
Merge branch 'master' into new-from [skip ci]