Fixed assets that were not working in Production

 This is a combination of 7 commits.
Merge branch 'develop'