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