Closes #1633 See merge request main/Sumatra!1377 sumatra-commit: 759d3385863bb04be2acbe3609af0257bf29ede8