Merge branch 'doc-genex-tweak' into release-3.15

Merge-request: !3939