Merge branch 'backport-3.23-cmake-P-path-args' into release-3.23

Merge-request: !7494