CLC-1397 Fix data type of uid (it's a string)