[STCV-388] STCV-388