Closes #1697 See merge request main/Sumatra!1466 sumatra-commit: 28d2200fe6e929a1234b016553689bdda59a6d2b