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