Closes #1632 See merge request main/Sumatra!1374 sumatra-commit: 723cda37eb71652b036c563248383e22228a17f7