whoops forgot to commit last few changes here from code review
Merge branch 'vendor-fulfill-request'