[ros-diffs] [hbelusca] 75323: Sync with trunk r75322.