Merge "Add correct flags dependency for force-grouping tests" into main