Closes #1585 See merge request main/Sumatra!1331 sumatra-commit: 59de72a490716834109500d9add663175d089179