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