[DF-4522] - Code Review