RYR-32412

RYR-32412