LUN-1952 convert both str & unicode to unicode