Editor's drafts for cherry-pick-133 branch of ietf-wg-scone/scone