Merge branch 'backport-ci-cmake.org-help' into ci-cmake.org-help