recover from interrupted importing
Merge branch 'pre_saved'