[DF-5115] more review fixes