[ros-diffs] [tkreuzer] 50666: Fix merge artifact