[SDDE-696] SDDE-696