DataPlaneSuite - fix 7