Closes #1625 See merge request main/Sumatra!1366 sumatra-commit: 4dcae30f18ffa6c35c456da11ec033d2bce0feef