Merge branch 'backport-3.26-help-CMP0105' into Help-CMP0105-clarifications