Closes #1571 See merge request main/Sumatra!1319 sumatra-commit: 16a59113b31914562d122eafe4beae6328d3de06