[WIP] PIM-3266: do not flush skipped items during an import

TODO: 

 - [x] fix
 - [ ] changelog
 - [ ] behats
Change type?