[ros-diffs] [tkreuzer] 44598: [MSACM32] Copy from trunk