Closes #1646 See merge request main/Sumatra!1391 sumatra-commit: eda284db1252ca03daa8f13493f1a403ee0ebc27