[ros-diffs] [janderwald] 32168: - apply changes from prev rev