[Commits] 7107adad090: MDEV-16401: Apply review comments to MDEV-16005