Closes #1716 See merge request main/Sumatra!1521 sumatra-commit: 6e7b48c0e1f6de25bd0d16b0f9aa8db14821f59c