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