[STCV-479] STCV-479