[DF-4530] - Code Review changes.