Issue #23452 Add support for our bundleless product entities.