Fixing import statement for package re-name
Merge branch 'dev'