Merge change 6736

* changes:
  Refactor VCard-related code.