Fixed resource import
Fixed cargo port
Merge branch 'dev'