Time to merge some PRs
951