Editor's drafts for jimg-issue-16 branch of hbs-guidance/draft-hbs-state