[ros-diffs] [pschweitzer] 58699: [CRT] Apply r58698 here as well