[STCV-366] STCV-366