Merge "Fail parseUri if end is missing" into sc-v2-dev