[STCV-507] STCV-507