Rollup many PRs to clear out the queue

This merges these PR together: #8430, #8370, #8386, #8388, #8390, #8394, #8402, and #8403.