[DF-5309] - Code Review fixes.