[550168] Keep distinct project when deresolving URIs
13 files changed