[OSST-029] OSST-029