PIM-3083: FlexibleEntityBundle does not exist anymore