Merge "Fix error double accounting in fuzzyCompare()"