Merge branch 'cleanup-tests-output' into 'develop'