Merge branch 'doc-cleanup-xrefs' into release
Merge branch 'release'