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