[DF-2274] Changes after review.