Merge branch 'main' into fix/1716-redact-supabase-secrets