Added step 2 of assets.module (bugfix)
Added step 3 of assets.module (bugfix)
Merge branch 'release-1.4' into develop