[DF-3430] Changes after review.