[STCV-367] STCV-367