[ros-diffs] [chorns] 15278: Merge r15277 to trunk