DataPlaneSuite - fix 2