Merge remote branch 'origin/feature/7414_fix_event_warnings'
Re #7425 Connect the button in the right spot
Merge branch 'feature/7425_fix_multi_submit' into develop