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