Merge "Fixing numeric sorting for numbers with leading zeros"