Fix import error during setup
Merge branch 'fix-import-settingsmodule'