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