Merge "Use resolved calling user id"