Merge branch 'cp/am-patch-format-doc'