Merge "Add a limit on channel group creation" into sc-dev