Merge "Support immutable user source"