Editor's drafts for other-fixes branch of scionassociation/scion-dp_I-D