ref #8651, #8467 Use unified aggregation class for matrix aggregation