Apply changes from Atmosphere/vibe-protocol@d4623be