remove warnings. re #7414
Merge remote branch 'origin/feature/7414_fix_event_warnings'