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