Merge branch 'mm/am-c-doc' into maint