Import fixes insight (rebased on develop)

See gh-2060 for details.

--rebased-from #2060