Merge "Fix field names and behavior in SlotRecord."