[ros-diffs] [aandrejevic] 60466: [SOFT386] Fix previous fix.