Merge branch 'ops/fix-ci' into 'develop'