Merge branch 'fix/docker-mogrify' into 'develop'