Merge branch 'ci-cmake.org-help' into release-3.22

Merge-request: !7144