[STCV-537] STCV-537