Merge branch 'hotfix/0.1.6.3'
fixed asset handling.
update changelog
Merge branch 'hotfix/0.1.6.4' into develop