Closes #1475 See merge request main/Sumatra!1210 sumatra-commit: bb850d0e9c7c267e2a66239fbac3629a799203b4