[OE-3731] Fixed grunt build
Merge branch 'feature/assets' into develop