[DF-4578] review fixes