Merge "Ensure correct user id is attached to URIs." into main