[OSST-028] OSST-028