Revert "PIM-1999: Remove useless class to load user data"

This reverts commit c03fd33f0266c9f2a352d00b34ec07a60752e9b5.
Merge branch 'master' into feature/pim-1773