[DF-1093] and [DF-1094]