Use new "grouped" attribute

review1005002