Url builder cleanup.
Merge branch 'urls' into dev