groupUntil experimental commit