[ros-diffs] [tkreuzer] 51472: Fix release build