Closes #1731 See merge request main/Sumatra!1502 sumatra-commit: 3b6a9d00321678b9cb1746970a6c61ed8a136c71