I'm fairly sure this fix is correct. We need to look at what the demo store is doing. Matching with an OR doesn't make sense to me. If you've specified an exact productStoreShipMethId, why should you receive anything other than the corresponding entity?
----- "Scott Gray" wrote: > This commit broke the demo system, no cost estimates are returned during > checkout any more.