DF-5108 fix review comments