Huge consolidation of back pull requests with tons of my own