[DF-2031] Code Review