(cherry picked from commit ae4945fb2c89397f81e7d0566784e6548b6de685) Conflicts: dev-support/docker/Dockerfile dev-support/docker/Dockerfile_aarch64
(cherry picked from commit ae4945fb2c89397f81e7d0566784e6548b6de685) Conflicts: dev-support/docker/Dockerfile dev-support/docker/Dockerfile_aarch64