Editor's drafts for seanturner-erratum-7888 branch of lamps-wg/cmp-updates