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