Merge branch 'fix_message_templates_select_order'
Merge branch 'fix_message_preview_template'
Merge branch 'fix_admin_submission_template'