Merge remote-tracking branch 'remotes/stsquad/tags/pull-docker-updates-050618-1'...