Merge "Update the dimension_in_what/condition field number."