DF-5129 resolve ivan review comments