Eng 6553 group by alias

Waiting for Jenkins...