Editor's drafts for juagargi/remove_qos branch of scionassociation/scion-research_I-D