[DF-4721] review fixes