Changes between #17767 and #18368

No changes in any of the builds.