Kam

REST work merge to OryxProject:master
Same, I think these were going to be merged? or is there a problem going that way? right now both are specified