Closes #1470 See merge request main/Sumatra!1207 sumatra-commit: 7125a1d45fbfece1e1db7bda950bd99fa5852728