Closes #1673

See merge request main/Sumatra!1426

sumatra-commit: 503f6445f3c5e4183061b1ebf9409cec8630bc18