Merge "Fix LinkFieldsComparator."