[STCV-357] STCV-357