Merge "immutable user source: v3 test_roles"