[DF-3732] review fixes