Merge branch 'release-1.5'
Added step 4th to asset.module (hotfix)
Merge branch 'hotfix-1.5.1' into develop