Merge branch 'xep0198c'