beremiz

'Merged' URI editor dialog and Discovery dialog, also clean up related code
/**
* No platform specific code for "Generic" target
**/