Merge "Fix issue with uid being passed instead of user id" into sc-v2-dev