BLK-41 GroupBy update

Signed-off-by: Oren Leiman <oleiman@neutral.io>