Editor's drafts for christian-review-v21 branch of core-wg/oscore-groupcomm