Closes #1634 See merge request main/Sumatra!1378 sumatra-commit: 751c2818f700677f57d54e8d056df4b8c8cc1a6c