RYR-32405

RYR-32405