Closes #1617 See merge request main/Sumatra!1357 sumatra-commit: 7d4a6af8526db377decaf7c7c94a6d308f470d43