Closes #1744 See merge request main/Sumatra!1517 sumatra-commit: 419c0b51a915e43ad10942b31bb6efa82e7ea8d5