Merge pull request #2055 from rmansoor/5.2

 [BACKLOG-824] - Adding a configuration for multibyte encoding.
[BACKLOG-824] - Fixed unit test