Merge branch 'hotfix/assets' into develop
test user creation
Merge branch 'develop'