Closes #1470 See merge request main/Sumatra!1205 sumatra-commit: bcf62b610a008346dfad6d284e42864618a8b25b