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