Closes #1729 See merge request main/Sumatra!1499 sumatra-commit: c7b911f550de53602f44253560e77991567814ae