Merge branch 'features/docker-updates' into 'develop'