[DF-2635] [DF-2446] Fix review issue.