This has duplicated changes with #1442 that will likely conflict and need rebase. Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/1444 Reviewed-by: Alex <lx@deuxfleurs.fr>