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