Closes #1677 See merge request main/Sumatra!1435 sumatra-commit: cbb8f8e44fb074834fe96ef22218bd2523e40d37