[DF-4862] review fixes