[DF-2264] fix review issues