Editor's drafts for afrind-two-subgroup-mapping branch of afrind/moq-test