(cherry picked from commit 5e40efe0ec38f1e1228846a5448d93bf040868ff) (cherry picked from commit d946387850ae2fe383df90dd2722560986236e31) Conflicts: dev-support/docker/Dockerfile
(cherry picked from commit 5e40efe0ec38f1e1228846a5448d93bf040868ff) (cherry picked from commit d946387850ae2fe383df90dd2722560986236e31) Conflicts: dev-support/docker/Dockerfile