[DF-3083], [DF-3084] - Code Review.