Closes #1706 See merge request main/Sumatra!1475 sumatra-commit: 976fcc6d3d5ffda0c4098b2f6f65a69fc35b8c7b