Closes #1686 See merge request main/Sumatra!1448 sumatra-commit: 50a89f3a47cd5135b2656d75814f004d929e44a0