DataPlaneSuite - fix 6