[ros-diffs] [hbelusca] 75545: [USETUP]: Sync with tfaber's r75536.