Closes #1615 See merge request main/Sumatra!1355 sumatra-commit: 279d1a165b94392e5c49f0d0e5c97343a5f8485b