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