[STCV-337] STCV-337