Merge "Fix ZWJ issue" into devel/master