[ros-diffs] [sir_richard] 46184: [DDK]: Merge 46183 from header-branch.