[SDDE-488]