Merge branch 'backport-3.24-doc-warning-as-error' into doc-warning-as-error