Revert "revert static-groups"

This reverts commit a05f6d17c3979944660b4f8cb84d67189c101de4.