[Commits] 608d677: Post review changes for MDEV-12387