Kam

REST work merge to OryxProject:master
Same as above here and elsewhere where its coded this way.