5393: Bring back changes from v1.13.3 into main r=irevoire a=Kerollmops Co-authored-by: Kerollmops <clement@meilisearch.com> Co-authored-by: Kerollmops <Kerollmops@users.noreply.github.com> Co-authored-by: Strift <lau.cazanove@gmail.com>