[STCV-338] STCV-338