Hard code in the groupId
Merge remote-tracking branch 'origin/master' into iOS-UI