fix for empty number formatting

@bug W-1766830@
Merging origin/jay/master-pending-emptynumber into master