Merge change 4292

* changes:
  Moved owning package and restricted flag to Contact.