RYR-32431

RYR-32431