[DF-3268] fix review issues