Closes #1735 See merge request main/Sumatra!1504 sumatra-commit: e59c9f3c8782e59adbc1a7399c386106c4dda659