[ros-diffs] [cgutman] 46720: - Move the code from my previous commit before signalling the user event - Sorry for the wasted commit number