RE: Patch request for 7036