[ros-diffs] [janderwald] 42145: - Add flags - Revert 42107