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