Merge "Diff the fields located at the same offset in a class"