Merge "Fix group 2 config for local testing" into main