Fixed uri handling for newer media endpoints
Fixed uri handling for newer media endpoints
Merge