Merge branch 'release-1.4'
Added step 4 of assets.module
Merge branch 'hotfix-1.4.1' into develop