[SDDE-706] SDDE-706