Issue #23452 Add support for our bendleless product entities.