[ros-diffs] [vmikayelyan] 72364: merge up to trunk r72363