Merge branch 'doc-project-none' into release-3.26

Merge-request: !8585