[STCV-334] STCV-334