Closes #1689 See merge request main/Sumatra!1454 sumatra-commit: c2fcc89547446cbb7adfaa4e649a1d0e15d99927