Merge branch 'backport-3.21-CMP0126-WARNING' into CMP0126-WARNING