Merge "DO NOT MERGE: Fix undefined arg eval order issue in fuzzy compare" into mnc-dev