LB-669: User Type module
* adjusted
Merge branch 'lb-669-user-types' into lb-482-user-comments