Merge branch 'ExternalProject-fix-log-in-custom-stamp' into release-3.14

Merge-request: !3045