Merge changes Ib35908b6,Ic27efba4

* changes:
  Lower autogroup count from 4 to 2
  Add a limit on channel group creation