Merge "Change groups to use number in the expander." into sc-dev