[Maria-developers] the patch for mdev-9976 broke some tests