Merge change 7651

* changes:
  Contacts Data type consistency.