[ros-diffs] [hbelusca] 63193: Sync with trunk r63192.