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