Merge "ART: Ensure order of field gaps"