[STCV-335] STCV-335