Merge "Update group capability before connect" into jb-dev