Fixed failing URLData test
Merge branch 'master' into u/ixa1