turned scoverage off until macros are supported
Merge remote-tracking branch 'origin/dev' into dev