Merge "Switch PacUrl storage from String to Uri"