[Commits] 997b4fa: MDEV-16188 Post review fixes