Merge pull request #4590 from jmarcet/docker_20_10_update