Examine upgrade [TFS Changeset #67959]
[TFS Changeset #66373]
Fixes User object issues: 27199, 27201 [TFS Changeset #66310]