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