@alessandrogario do you mind if we ship 6044 and then rebase 6197 again on top of that and handle any conflicts? Are you cool to do that or do you need help?