Merge "Fix FieldGap priority queue ordering bug."