Merge "Immutable user source: Non-admin V2 and V3 tests"