Merge branch 'tb/test-apfs-utf8-normalization'