[STCV-289] STCV-289