[ros-diffs] [tkreuzer] 57943: [RTL] Reapply a fix, that got reverted accidentally in r57938