custom users view bug fixed
Merge branch 'hotfix/usersCustom' into develop
Merge branch 'release/1.2.1'