Merge pull request #5153 from cypof/docker