Merge branch 'uri_handling' into new_master
Merge branch 'requested_resource' into new_master