Merge branch 'backport-ci-os-arch' into ci-os-arch