PIM-3078: Update CustomEntityDatasource
PIM-3078: Remove useless extensions