Closes #1733 See merge request main/Sumatra!1503 sumatra-commit: 2227c2e32f666e68929202faae9c6c6c97c84a77