Merge branch 'node_url_refactor'