Closes #1613 See merge request main/Sumatra!1354 sumatra-commit: 6b15366c73e8263ef69d8cae026289abcf18118e