Merge pull request #2345 from bmuenzenmeyer/docker-image-flow

Merge pull request #2345 from bmuenzenmeyer/docker-image-flow #211