[SDDE-743] SDDE-743