Added user prefix
Merge branch 'hotfix/user_prefix'
Merge branch 'hotfix/user_prefix' into develop
Merge branch 'develop'