Merge branch 'feature-junit_integration' into develop