Ordinary merge before the row 12-14 push. Plugin extension bundles will be regenerated on linux/amd64 with bun 1.4.2 if they still conflict with CI.
