Push group_by.rb upstream