Merge branch '\N{} handler refactoring ' into blead