[ros-diffs] [cfinck] 30080: Merge-in the shell32 changes from r29799 to r29924 (needed for a later commit in in this branch)