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