(cherry picked from commit 81d8b71534645a2109a037115fb955351edfbf64) Conflicts: dev-support/docker/Dockerfile