First round of updates for bundled products. #594