Merge "SF: adjust kNonExactMatchingPenalty"