[ros-diffs] [spetreolle] 47086: Fix merge artifact.