At first sight this looks fine, thanks. Unfortunately I probably won't be able to properly review this this week, but I should be able to get to it early next week.
Note that this currently fails the CI though. Probably because it's intended to be applied on top of !325, so hopefully that will get resolved once those patches actually get committed.