[STCV-387] STCV-387