Merge branch 'ExternalProject-CMP0054' into release-3.10

Merge-request: !1369