[DF-879] and [DF-882] fix.