Fix the field count detection when using awk. #3454
Merge branch 'branch_v2plus_3454' into branch_v2plus_2975