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