Closes #1610 See merge request main/Sumatra!1351 sumatra-commit: 43c7fe83eaa187a0207b8e86b988e9b834aeb17d