[ros-diffs] [gadamopoulos] 66384: [SHELL32] - Fix build. Also note that the previous patch was from Huw Campbell.