Closes #1619

See merge request main/Sumatra!1360

sumatra-commit: f7972214e6da520a46d6d184f3d33d539c6c5daa