Fix issue with Import Settings fixes#10709
Merge pull request #1042 from jburel/rebased/develop/import-screen-fix-10709

Fix issue with Import Settings fixes#10709 (rebased onto develop)