Added fix for initializing groupIndex order correctly.  Added to both source and build, but did not rebuild yet until we get back on the parent repo.