MDL-43252 Group menu in wrong order when groupings used