[ros-diffs] [tkreuzer] 40986: Sync msacm with wine HEAD