Merge "Update parcling logic for Uris." into rvc-dev