Closes #1712 See merge request main/Sumatra!1478 sumatra-commit: 3818311df3eaeb641e77b63b7dddd78e4f8a7adc