Fixed converage report generation.
Merge branch 'develop' into configuration_structure