UserInfo unit tests
UserInfo unit tests
Merge branch 'victor.klymenko' into develop