Merge change 8888

* changes:
  Voicemail number setting is throwing exception