Add diagnostics event
Merge branch 'feature/connery/diagnosticEvent' into develop
Add Diagnostics even to... compile?