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