Merge upstream
Merge pull request #606 from github/address-merge-conflicts

Add update image for payload_request