[DF-2185] Changes after review.