Merge "Add group highlighting to AA+ result" into sc-dev