[DF-1814] and [DF-1816] changes after review.