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