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