v2 of Field Mapping configuration UI