[ros-diffs] [cgutman] 36256: - Add the spin locks back that I removed