Merge "Immutable user source: v3 test_groups"