[STCV-389] STCV-389