Merge "Fix (again) bad scan record data length"