added step 2 of assets.module (bug fix)
added step 3 of assets.module (bug fix)
Merge branch 'release-1.4'
Merge branch 'release-1.4' into develop
added step 4 of assets.module (hotfix)
Merge branch 'hotfix-1.4.1' into develop