Partially solves the issue of imports taking too long
approved this merge request
merged
mentioned in commit de1d42cc
