Merge 'feature-junit_integration' into 'develop'