Fixed issue with Assets
Merge branch 'hotfix/v1.1.4a'