Closes #1699 See merge request main/Sumatra!1469 sumatra-commit: fd7e8ff8537a59fdfa936a5271bdd8201198ac27