Merge branch 'rs/userdiff-multibyte-regex'