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