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