Use only useForSms phone number
Merge branch 'case-2596' into develop