[ros-diffs] [hbelusca] 58152: Sync with trunk r58151 to bring the latest changes from Amine and Timo.