[Maria-developers] Re MDEV-21610, cleanup patch