[DF-1965] - Code Review change is implemented.