Merge "Modify to get the encoded offset in UTF8" into devel/master