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