Merge pull request #14665 from andrielfn/avoid-uri-parsing

Avoid URI parsing