Use FieldIdx
in various things related to aggregates
#109849
+51
−46
Merged