Merge "Adding support for numeric collation when using UCA collations"