[ros-diffs] [janderwald] 30367: - hackfix build