[STCV-519] STCV-519