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