No user visible change. This is needed for #105773, but will cause conflicts in the main branch, so committing it separately.
No user visible change. This is needed for #105773, but will cause conflicts in the main branch, so committing it separately.