#26342 RBC fixes