some comments and temorary fixes due to deployment problems and code coverage instrumentation
Merge remote-tracking branch 'origin/develop' into develop