Merge branch 'kb/diff-blob-blob-doc' into maint