Providing a way to use elements in the tree which adapt to URI.class.
Merge branch 'external_uri' into development