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