[ros-diffs] [dreimer] 48969: Merge 48915 and 48923 to 0.3.12 branch.