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