Merge branch 'so/diff-doc-for-patch-update' into maint-2.42