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