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