[ros-diffs] [arty] 39641: Merge cdfs from the WIP branch (and from previous merge traffic). Bring in my partly backported WIP from git.