[ros-diffs] [rnaumann] 69226: [USETUP] Addendum to r69121 CORE-10058