[ros-diffs] [weiden] 27947: Fix stack corruption