Closes #1614 See merge request main/Sumatra!1359 sumatra-commit: 62ef5a1569bdda1403a23f259b6058390c4d46ba