Fixed NFD boundary issue in matches/replace
Merge branch 'dev' into ms