Merge branch 'rr/doc-content-type' into maint