Import now properly handles images. It only added missing images beforehand but now will properly: - Remove - Resort - Add - Update Relates: #10521
We switched to PHPDataSets already but didn't migrate all usages. This commit now migrates all usages left behind.