Closes #1622 See merge request main/Sumatra!1361 sumatra-commit: 638532de4c81990c67fca22ad736b192859d5de7