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