[DF-3582] fix review issues