Closes #1705 See merge request main/Sumatra!1474 sumatra-commit: ada46fd32100d71a01b10f7b77f47fe1d8b3b077