Merge branch 'feature/ci-registry' into 'develop'