Merge pull request #3664 from koying/quickpr