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