Adds confirmation before submitting
Merge branch 'confirm_before_submission' into 18_compatibility_fix