Merge changes from topic "am-702f2c9bb4774f2e8bd01af7032e3b45" into main

* changes:
  [automerger skipped] Merge "Fail parseUri if end is missing" into tm-qpr-dev am: f21e24ea -s ours am: 5ec1f156 -s ours am: 0daa8808 -s ours am: d16c69ca -s ours
  [automerger skipped] Fail parseUri if end is missing am: e1216679 -s ours am: b7c346f9 -s ours am: 726be6ac -s ours am: 3178b129 -s ours