assemble to view
Merge branch 'hotfix' into dev