[DF-3327] fix review issues