Card #48 fix to make sure group is attached to the session.
Merge remote-tracking branch 'origin/develop' into develop