some improvements to import filters
Merge branch 'master' into release-2.0