Recent Commits to redirection:trunk

Various tweaks to import/export (#4253)

* Various tweaks to import/export

* Fixes