Closes #1704

See merge request main/Sumatra!1472

sumatra-commit: e96e8858bbcb4a5787a53f149cfa7b5c206d2bae