remove warnings. re #7414
Merge branch 'feature/7414_fix_event_warnings' into develop