[DF-4625], [DF-2339] - Code Review.