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