Merge branch 'backport-3.23-ExternalProject-stamp-cfgdir' into release-3.23

Merge-request: !7396