Merge branch 'doc-cmp0082' into release-3.14

Merge-request: !3133