Thanks to Claude Paroz for the report. Backport of 89e695a69b16b8c0e720169b3ca4852cfd0c485f from main