[OSST-025] OSST-025