Closes #1630 See merge request main/Sumatra!1371 sumatra-commit: 88a755f54e7c9b09bac732631e8ef68cff1392d8