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