[DF-1622], [DF-1674] are fixed.