[DF-2382] fix review issues