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