Task 33260
This branch commits my original #33260 (closed) patch, three cherry-picked commits written by @acute, and another commit written by me in response to the discussion on #33260 (closed). Optimistically assigning to @acute.
This branch commits my original #33260 (closed) patch, three cherry-picked commits written by @acute, and another commit written by me in response to the discussion on #33260 (closed). Optimistically assigning to @acute.