[STCV-484] STCV-484