[DF-4233] review fixes