[ros-diffs] [robertk] 14390: potential revision for RC2