Modified for getUser
Merge commit '0972e588c82b8f623d8b003d1273cf0408b2fc2e'