OPAL-1477: Use of UriBuilder