[STCV-497] STCV-497