Merge branch 'ci/docker-imaging' into 'develop'