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