Merge "Change dictionary results to use a bundle instead since it is a structured result." into sc-dev