Merge branch 'release/2.1.1' into develop
Ensure submission exists when referenced

and removed 'Save as Draft' button
bump version 2.1.2
Merge branch 'release/2.1.2'