DF-5129 fix alexey review