- Merge r35555, r35575, r35576, and r36243 into my branch