Only look for Unicode @s
Merge branch 'utilities-maintenance'