Merge pull request #3657 from koying/quickpr