Merge branch 'chore/ci-speedup' into 'develop'