Merge branch 'fix-docker-build' into 'develop'