[ros-diffs] [dreimer] 49101: Merge r49096 to cmake branch