[ros-diffs] [cgutman] 41832: - Don't overwrite previously set flags