DF-5129 fix ivan review