convert group timeout to plain input
Merge remote-tracking branch 'origin/5228-timeouts-groups' into review_5228