Merge "Fix issue where handle is in front of word rather than end of word" into mnc-dev