Merge pull request #15109 from G-M0N3Y-2503/docker-20.10.5