[ros-diffs] [tkreuzer] 36847: sync to trunk revision 36700