Merge branch 'net-ReST-part-two'