update to move variant calculator lazy load to product bundle