Merge "Fix error double accounting in fuzzyCompare()" am: 0cf17c4bf8