Issue #2376695 by slashrsm: Automatically set URI if not yet defined.