RYR-32289

RYR-32289