@alessandrogario was the plan for #6197 to let it close and just ship a 1-liner on top of 6044? Or do you wanna keep that one alive and keep rebasing it? I think it's fine to ship after 6044 lands