[DF-1806], [DF-1807] are fixed.