Merge "ART: Fix ignoring duplicate fields."