Merge pull request #12897 from TDT-AG/pr/20200721-docker-ce