Fix imcompatible import statement
Merge branch 'feature/urls-import-fix' into develop
Merge branch 'release/update-for-1-6-1'