Merge "Fail parseUri if end is missing" into tm-qpr-dev