Eng 3291 groupby

Jenkins pushed.