Merge "Ensure calling user is the same as requested user." into sc-dev