Refactored Assets
Merge branch 'hotfix/v1.1.8'