[ros-diffs] [blight] 18296: Patch by Christoph v.W.: