[ros-diffs] [cwittich] 68928: [CRT] Addendum to r68927