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