@Christian Beikov looks like the commit that introduced this regression was authored by you. Can you take a look if you have some time? 🙂