[Maria-developers] MDEV-7540 commits.