Added asset module
Merge branch 'hotfix-1.4.1' into develop