[ros-diffs] [tfaber] 68765: [RSHELL] - Addendum to r68764 CORE-9892