Remove unused field
fix #3740: import from web does not work if started a second time
Merge branch 'release' into upstream