Merge branch '3616_utf8_normalize_speedup'