[DF-798] and [DF-827].