Merge change I0e52b194

* changes:
  Bug fixing for NumberFormat and BigDecimal.