another fix for the autogroup option
Merge branch '1.x' into 2.x