[ros-diffs] [hbelusca] 66752: [RSHELL]: Sync back with r66271.