DF-5423 fix review comments