* commit 'd1087e74ad38c0918f325775873330110e497eea': Qualify the uid with the userId when granting permissions