Hi, I've cherry-picked a patch from upstream which fixes #881125 and did a bit of minor housekeeping. Changes have been pushed to git, please sponsor the upload. Thanks Lukas