Okay, I will update the static dtor PR when this got merged.