Default app groups master

fixes #9522 
The old approach is easier to test, isn't it?