Automatic merge from submit-queue (batch tested with PRs 48698, 48712, 48516, 48734, 48735) Name change: s/timstclair/tallclair/ I changed my name, and I'm migrating my user name to be consistent.