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