[DF-1862] - Code Review request is implemented.