am 3f43b5f4: Merge "ART: Ensure order of field gaps"

* commit '3f43b5f4881db5a1f7bd13a095f720b7c1ddba6a':
  ART: Ensure order of field gaps