Merge change 25809 into eclair

* changes:
  Create group when it doesn't exist.