[Maria-developers] bugs MDEV-8167 and MDEV-6973