Closes #1558 See merge request main/Sumatra!1309 sumatra-commit: 09ac3dda9f578a580833f4cc746ebd943219d3f3