Closes #1745 See merge request main/Sumatra!1518 sumatra-commit: 4db23dc3cf3ffbedd6739ef0b94bf805bf7b896d