This is the real MR, rebased onto 81.1.1.
My goal is that each fixup commit is a small and logical change.
Closes #40044 #40041
This supersedes !21 (closed) and !23 (closed) (if those look good).
This is the real MR, rebased onto 81.1.1.
My goal is that each fixup commit is a small and logical change.
Closes #40044 #40041
This supersedes !21 (closed) and !23 (closed) (if those look good).