Merge branch 'jc/t9129-any-utf8' into maint