Merge "Fix ZWJ, ZWNJ issues" into devel/master