[ros-diffs] [cgutman] 36333: - Store the current thread