Merge branch 'more-efficient-ci' into 'develop'