Merge pull request #5002 from drizzle-team/main-next-pack