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