agreed

we should sync with #2598 as it contains fixes too.

I need to find the time to review all this. Sorry guys