Fixes for importing data single and multiple times
Merge remote-tracking branch 'origin/release' into release