Merge branch 'ci-test-fix' into 'develop'