Merge branch 'doc-timestamp-f' into release-3.24

Merge-request: !7796