update request/harvest stuff
Merge branch 'master' into working-on