Moving restclients back to master