friendly uri check from rpc added
Merge testing into develop
friendly uri check from rpc added
Merge testing into develop
friendly uri check from rpc added
friendly uri check from rpc added
Merge testing into develop
Merge origin/develop into develop