Fix OLD behavior of CMP0021.
Merge topic 'fix-OLD-CMP0021' into next

3ab9f2b Fix OLD behavior of CMP0021.