Rework JoinGroup, and LeaveGroup, such that they are compatible when using Oracle.
Merge branch 'master' into oracle