[ros-diffs] [tkreuzer] 43800: merge r43777 from amd64 branch