Cherry-pick of #42416 to preview ---- Fixes ZED-356 Release Notes: - N/A *or* Added/Fixed/Improved ... Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com> Co-authored-by: Lukas Wirth <lukas@zed.dev> Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>