[DF-3966] review fixes