am ca96a322: Merge "Update group capability before connect" into jb-dev

* commit 'ca96a322f0485db9f0beed243e10a607c909729f':
  Update group capability before connect