Assets issue sorted
Merge branch 'hotfix/v1.1.4'