Merge branch 'backport-ci-rename-jobs' into ci-rename-jobs