Merge branch 'doc-header-only' into release-3.24

Merge-request: !8071