[STCV-362] STCV-362