Merge "Added country based formatNumber methods"