Closes #1710 See merge request main/Sumatra!1477 sumatra-commit: e3200ded0c4e5aa9921363143551d133c6661b21