Merge change 8134

* changes:
  Adding contact group NOTES and SYSTEM_ID