updates old code
merges default into bug26129
adds uri support for benchmark specs
improves uri handling
Merge bug26129