Merge pull request #2004 from poolifier/combined-prs-branch