Merge branch 'oa/doc-diff-check' into maint