U4-4056 - better unicode/ascii support for urls
merge branch 'origin/6.2.0' into 7.0.2 + fix