Merge "Make ReferenceWithHistory output easier to use" into sc-dev