Working on #109.
Test for #109. Close #109.
Merge branch 'master' into bug-group-join-any-68
Working on #68.