[DF-1966] - Code Review fix.