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