Closes #1642 See merge request main/Sumatra!1387 sumatra-commit: 7d947af68ff772fcc13bd1bdc39c800cad8fd583