[STCV-489] STCV-489