Resolve "Imports: improvements"

Merged Ruben Backx requested to merge 172-imports-improvements into dev

Closes #172 (closed)

Merge request reports