Import assets fix
Merge branch 'Ski-master'