Closes #1754 See merge request main/Sumatra!1529 sumatra-commit: 3e7464dfaa869a9fd6c3c50c46b78a3351d26f89