Merge branch 'by/blame-doc-m-c' into maint