bug #18040: remove extra submit button
Merge branch 'feature/bug_18040_remove_extra_submit_button' into develop