[ros-diffs] [akhaldi] 51701: * Reduce difference to the cmake branch.