This commit and the previous merge attempts to align my tree with upstream changes. It works for me but apologies in advance if i break anything