[ros-diffs] [ion] 25820: - KD Branch