Don't resolve relative urls.
Merge branch 'ari-3985' into ait-qa