DF-5417 fix review