[STCV-477] STCV-477