Merge branch 'sb/blame-config-doc' into maint