Properly handle alphanumeric 'numbers'.

Change-Id: I326198c19bb567846d09f8bb8c293a024c830296
JIRA:CYAN-3234
Merge pull request #1 from Mahdi-Rom/kk-4.4

Properly handle alphanumeric 'numbers'.