Merge "Resolving resources across users."