Merge branch 'doc-rel-3.16-updates' into release-3.16

Merge-request: !4425