Patch patch 3 does not apply to net-next-0