group timeout may be null
Merge remote-tracking branch 'origin/5228-timeouts-groups'