4178: Avoid DSE Export freezes

Merged Simon Barner requested to merge 4178 into master

Merge request reports