Rolling up PRs in the queue

Let's try this again!