Changes between #22943 and #23778

No builds.