Merge branch 'feature/8505_event_mode' into develop
Merge branch 'bugfix/8533_catch_syntax_errors' into develop