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