Merge "Commafy support for convertNumber"