Switch from RC to R6
Update group by docs