[ros-diffs] [cgutman] 35575: - Release the cancel spin lock before returning - Revert some unintentional changes made in r35485