Merge "Do not fix uris inside the system." into lmp-mr1-dev