DataPlaneSuite - fix 5