Merge branch 'ExternalProject-revert-install' into release-3.25

Merge-request: !8279