Closes #1535 See merge request main/Sumatra!1287 sumatra-commit: 1de296db96f09c216bc66455c60a8c45c4bbbfb7