main
Merge branch 'upstream-at-v3.36.2' into roo-v3.36.2
Revert "Revert "Include changes from Roo v3.18.5""
fix: resolve CI e2e test ETIMEDOUT errors when downloading VS Code (#7583)