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