Merge "Don't assume that the primary user is user 0" into nyc-dev