Issue #2640734: Allow manual imports

Pieter Frenssenrequested to merge
issue/default_content-2640734:2640734+2698425+manual-import+retain-existing into 2.0.x

Merge request reports