[OE-3731] Fixed asset references
Merge branch 'feature/assets' into develop