Rolling up PRs in the queue

Closes #12167
Closes #12200
Closes #12206
Closes #12209
Closes #12210
Closes #12211
Closes #12215
Closes #12217