merge upstream
Merge remote-tracking branch 'upstream/master'
Added User data object to client