[ros-diffs] [hbelusca] 73652: Port trunk commit r73651.