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