Editor's drafts for review-fixes branch of scionassociation/scion-cp_I-D