Merge change 3471 into donut

* changes:
  Fix contact creation.