Closes #8565 Closes #8536 (cherry picked from commit be5802e47335cded38af67979e45f060e3779595)
Mostly just addressing comments from #8452 (cherry picked from commit b1ccebf329e9a9d77894b9d4ff06aeb9d7317acf)