Closes #1746 See merge request main/Sumatra!1519 sumatra-commit: 88184eb745ac28ed3c8e872fed39ab0b96dc4280