Merge branch 'CoC-draft' into adopted