Closes #1749

See merge request main/Sumatra!1524

sumatra-commit: 7156ebe05eaab51cb1e7232f5619fd6ddb52dc9e