Merge branch 'backport-4.2-cmake-P-script-case'