I don’t think it necessarily needs to block Scrooge upgrade, right? I agree they’re both conflicting, but it seems whichever doesn’t get merged first will just need to rebase and adapt to the changes made by the other Thanks Danny for looking into it more!