[STCV-371] STCV-371