Fixes #3378 : make group creation optional