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