[DF-3966] fix review issues