Merge "Improved Field Classification edit distance algorithms." into pi-dev