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