Update user schema (to avoid cherry picking)
Merge remote-tracking branch 'upstream/master'