Closes #1599 See merge request main/Sumatra!1338 sumatra-commit: 540e952d3dd31f0b2c72d6a1d51631f1916c1b91