Closes #1713 See merge request main/Sumatra!1479 sumatra-commit: 47d1dae3bf00b4bacd887eaf33a0df5d5786f764