[STCV-384] STCV-384