[DF-4748] Fix review comments