Merge branch 'doc-3.15-std-fix' into release-3.16

Merge-request: !4574