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