[STCV-508] STCV-508