Added grouping API.
Fixed bug in grouping handler naming.
Added support for block size.
Merge branch 'test' into dev